using System;
using System.Collections.Generic;
using System.Text;
using System.Windows.Forms;
using Ltf.MonitorLizard.Controls;
using System.ComponentModel;

namespace Ltf.MonitorLizard.Forms
{
	public partial class DirDiff
	{

		#region control definitions
		private TextBox txtPath1;
		private Label label2;
		private Label label3;
		private TextBox txtPath2;
		private Button cbtPath1;
		private Button cbtPath2;
		private Button cbtCompare;
		private Button cbtExit;
		private CheckBox ckbIgnoreTabExpansions;
		private CheckBox ckbIgnoreSpaceChanges;
		private CheckBox ckbIgnoreWhiteSpace;
		private CheckBox ckbIgnoreBlankLines;
		private CheckBox ckbIgnoreCase;
		private TreeView trvDifResults;
		private CheckBox ckbShowDiffs;
		private CheckBox ckbShowSames;
		private CheckBox ckbShowMissing;
		private CheckBox ckbShowAllPaths;
		private IContainer components;
		private CheckBox ckbShowTotals;
		private CheckBox ckbShowDiffMetrics;
		private StatusBar sbProgress;

		private ImageList imageList1;
		private CheckBox ckbUserChecks;
		private CheckBox ckbShowFullPaths;
		private ContextMenu cmDiffFileNode;
		private MenuItem cmiShowWindiff;
		private MenuItem cmiShowGnu;
		private MenuItem cmiEditFrom;
		private MenuItem cmiEditTo;

		private string diffPath1 = "";
		private string diffPath2 = "";

		private CheckBox ckbShowAdded;
		private Button cbtTFPath2;
		private Button cbtTFPath1;
		private ComboBox cmbVersion1;
		private ComboBox cmbVersion2;
		private PictureBox pbSame;
		private Label label4;
		private Label label5;
		private PictureBox pictureBox1;
		private Label label6;
		private PictureBox pictureBox2;
		private Label label7;
		private PictureBox pictureBox3;

		private CheckBox chkCompareToLocal;
		private Label lblConflict;
		private PictureBox pbConflict;
		private MenuItem menuItem1;


		private int deletionId1 = 0;
		private Button cbtPatch;
		private CheckBox chkFromAsTo;
		private int deletionId2 = 0;

		private bool savePatchOnFinish = false;
		private string patchFileName = string.Empty;

		private bool isPrepareMerge;
		private bool isMerge;

		private HistorySelector historySelector1;
		private CheckBox ckbTrackRenames;
		private GroupBox grbDifferenceOptions;
		private GroupBox grbDifferenceResults;
		private GroupBox grbDifferenceSubjects;
		private GroupBox grbMergeOptions;
		private RadioButton rbtTFSMerge;
		private RadioButton rbtLizardMerge;
		private Label label1;
		private Panel pnlLtfMergeTarget;
		private TextBox txtLtfMergeTarget;
		private TabControl tabControl1;
		private TabPage tabPage1;
		private TabPage tabPage2;
		private TabPage tabPage3;
		private GroupBox gbChangeSets;
		private ListView lvwHistory;
		private ColumnHeader lchChangeset;
		private ColumnHeader lchAuthor;
		private ColumnHeader lchDate;
		private ColumnHeader lchComment;
		private ColumnHeader lchWorkItems;
		private ImageList fileImages;
		private Ltf.MonitorLizard.Controls.ServerSelector sselConnection2;
		private Ltf.MonitorLizard.Controls.ServerSelector sselConnection1;
		private Button btnLtfMergeTarget;
		private ComboBox cmbTfsMergeTarget;
		private Button cbtPrepareMerge;
		private Button cbtViewChangesets;
		private HistorySelector historySelector2;


		private string mergePath1, mergePath2, mergeTargetPath, mergeVersion1, mergeVersion2 = string.Empty;
		private Button btnAutoMerge;
		private Button btnManualMerge;
		private Panel pnlMergeResults;
		private StatusStrip statusStrip1;
		private ToolStripStatusLabel tsslMergeable;
		private ToolStripStatusLabel tsslConflictingChanges;
		private CheckBox chkAllChangedFiles;
		private ToolStripStatusLabel tsslExisting;
		private ListView lsvMergeResults;
		private ColumnHeader chmrFileName;
		private ColumnHeader chmrPath;
		private ColumnHeader chmrInserts;
		private ColumnHeader chmrChanges;
		private ColumnHeader chmrDeletes;
		private ColumnHeader chmrConflicts;
		private ColumnHeader chmrExisting;
		private ColumnHeader chmrNewName;
		private Panel pnlChangeSetFiles;
		private PictureBox pcbSlideLeft;
		private PictureBox pcbSlideRight;
		private Splitter splitter1;
		private ListView lvwDetails;
		private ImageList imlMergeList;

		private System.Windows.Forms.ColumnHeader lchFile;
		private System.Windows.Forms.ColumnHeader lchChangeType;
		private System.Windows.Forms.ColumnHeader lchFolder;

		private SidewaysText swcCaption;
		#endregion

		#region Windows Form Designer generated code

		private void InitializeComponent()
		{
			this.components = new System.ComponentModel.Container();
			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DirDiff));
			this.txtPath1 = new System.Windows.Forms.TextBox();
			this.label2 = new System.Windows.Forms.Label();
			this.label3 = new System.Windows.Forms.Label();
			this.txtPath2 = new System.Windows.Forms.TextBox();
			this.cbtPath1 = new System.Windows.Forms.Button();
			this.cbtPath2 = new System.Windows.Forms.Button();
			this.trvDifResults = new System.Windows.Forms.TreeView();
			this.imageList1 = new System.Windows.Forms.ImageList(this.components);
			this.cbtCompare = new System.Windows.Forms.Button();
			this.cbtExit = new System.Windows.Forms.Button();
			this.ckbIgnoreTabExpansions = new System.Windows.Forms.CheckBox();
			this.ckbIgnoreSpaceChanges = new System.Windows.Forms.CheckBox();
			this.ckbIgnoreWhiteSpace = new System.Windows.Forms.CheckBox();
			this.ckbIgnoreBlankLines = new System.Windows.Forms.CheckBox();
			this.ckbIgnoreCase = new System.Windows.Forms.CheckBox();
			this.ckbShowDiffs = new System.Windows.Forms.CheckBox();
			this.ckbShowSames = new System.Windows.Forms.CheckBox();
			this.ckbShowMissing = new System.Windows.Forms.CheckBox();
			this.ckbShowAllPaths = new System.Windows.Forms.CheckBox();
			this.ckbShowTotals = new System.Windows.Forms.CheckBox();
			this.ckbShowDiffMetrics = new System.Windows.Forms.CheckBox();
			this.sbProgress = new System.Windows.Forms.StatusBar();
			this.ckbUserChecks = new System.Windows.Forms.CheckBox();
			this.ckbShowFullPaths = new System.Windows.Forms.CheckBox();
			this.cmDiffFileNode = new System.Windows.Forms.ContextMenu();
			this.cmiShowWindiff = new System.Windows.Forms.MenuItem();
			this.cmiShowGnu = new System.Windows.Forms.MenuItem();
			this.cmiEditFrom = new System.Windows.Forms.MenuItem();
			this.cmiEditTo = new System.Windows.Forms.MenuItem();
			this.menuItem1 = new System.Windows.Forms.MenuItem();
			this.ckbShowAdded = new System.Windows.Forms.CheckBox();
			this.cbtTFPath2 = new System.Windows.Forms.Button();
			this.cbtTFPath1 = new System.Windows.Forms.Button();
			this.cmbVersion1 = new System.Windows.Forms.ComboBox();
			this.cmbVersion2 = new System.Windows.Forms.ComboBox();
			this.label4 = new System.Windows.Forms.Label();
			this.label5 = new System.Windows.Forms.Label();
			this.label6 = new System.Windows.Forms.Label();
			this.label7 = new System.Windows.Forms.Label();
			this.chkCompareToLocal = new System.Windows.Forms.CheckBox();
			this.lblConflict = new System.Windows.Forms.Label();
			this.pbConflict = new System.Windows.Forms.PictureBox();
			this.pictureBox3 = new System.Windows.Forms.PictureBox();
			this.pictureBox2 = new System.Windows.Forms.PictureBox();
			this.pictureBox1 = new System.Windows.Forms.PictureBox();
			this.pbSame = new System.Windows.Forms.PictureBox();
			this.cbtPatch = new System.Windows.Forms.Button();
			this.chkFromAsTo = new System.Windows.Forms.CheckBox();
			this.ckbTrackRenames = new System.Windows.Forms.CheckBox();
			this.grbDifferenceOptions = new System.Windows.Forms.GroupBox();
			this.grbDifferenceResults = new System.Windows.Forms.GroupBox();
			this.grbDifferenceSubjects = new System.Windows.Forms.GroupBox();
			this.sselConnection2 = new Ltf.MonitorLizard.Controls.ServerSelector();
			this.sselConnection1 = new Ltf.MonitorLizard.Controls.ServerSelector();
			this.grbMergeOptions = new System.Windows.Forms.GroupBox();
			this.label1 = new System.Windows.Forms.Label();
			this.rbtTFSMerge = new System.Windows.Forms.RadioButton();
			this.rbtLizardMerge = new System.Windows.Forms.RadioButton();
			this.pnlLtfMergeTarget = new System.Windows.Forms.Panel();
			this.btnLtfMergeTarget = new System.Windows.Forms.Button();
			this.txtLtfMergeTarget = new System.Windows.Forms.TextBox();
			this.cmbTfsMergeTarget = new System.Windows.Forms.ComboBox();
			this.tabControl1 = new System.Windows.Forms.TabControl();
			this.tabPage3 = new System.Windows.Forms.TabPage();
			this.cbtRollbackChangesets = new System.Windows.Forms.Button();
			this.cbtPrepareMerge = new System.Windows.Forms.Button();
			this.cbtViewChangesets = new System.Windows.Forms.Button();
			this.gbChangeSets = new System.Windows.Forms.GroupBox();
			this.pnlChangeSetFiles = new System.Windows.Forms.Panel();
			this.lvwDetails = new System.Windows.Forms.ListView();
			this.lchFile = new System.Windows.Forms.ColumnHeader();
			this.lchChangeType = new System.Windows.Forms.ColumnHeader();
			this.lchFolder = new System.Windows.Forms.ColumnHeader();
			this.fileImages = new System.Windows.Forms.ImageList(this.components);
			this.splitter1 = new System.Windows.Forms.Splitter();
			this.lblCSFilesOutsidePath = new System.Windows.Forms.Label();
			this.pcbSlideRight = new System.Windows.Forms.PictureBox();
			this.pcbSlideLeft = new System.Windows.Forms.PictureBox();
			this.swcCaption = new Ltf.MonitorLizard.Controls.SidewaysText();
			this.lvwHistory = new System.Windows.Forms.ListView();
			this.lchChangeset = new System.Windows.Forms.ColumnHeader();
			this.lchAuthor = new System.Windows.Forms.ColumnHeader();
			this.lchDate = new System.Windows.Forms.ColumnHeader();
			this.lchComment = new System.Windows.Forms.ColumnHeader();
			this.lchWorkItems = new System.Windows.Forms.ColumnHeader();
			this.tabPage1 = new System.Windows.Forms.TabPage();
			this.tabPage2 = new System.Windows.Forms.TabPage();
			this.chkAllChangedFiles = new System.Windows.Forms.CheckBox();
			this.btnAutoMerge = new System.Windows.Forms.Button();
			this.btnManualMerge = new System.Windows.Forms.Button();
			this.pnlMergeResults = new System.Windows.Forms.Panel();
			this.lsvMergeResults = new System.Windows.Forms.ListView();
			this.chmrFileName = new System.Windows.Forms.ColumnHeader();
			this.chmrPath = new System.Windows.Forms.ColumnHeader();
			this.chmrInserts = new System.Windows.Forms.ColumnHeader();
			this.chmrChanges = new System.Windows.Forms.ColumnHeader();
			this.chmrDeletes = new System.Windows.Forms.ColumnHeader();
			this.chmrConflicts = new System.Windows.Forms.ColumnHeader();
			this.chmrExisting = new System.Windows.Forms.ColumnHeader();
			this.chmrNewName = new System.Windows.Forms.ColumnHeader();
			this.imlMergeList = new System.Windows.Forms.ImageList(this.components);
			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
			this.tsslMergeable = new System.Windows.Forms.ToolStripStatusLabel();
			this.tsslConflictingChanges = new System.Windows.Forms.ToolStripStatusLabel();
			this.tsslExisting = new System.Windows.Forms.ToolStripStatusLabel();
			this.chmrResolutions = new System.Windows.Forms.ColumnHeader();
			((System.ComponentModel.ISupportInitialize)(this.pbConflict)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.pbSame)).BeginInit();
			this.grbDifferenceOptions.SuspendLayout();
			this.grbDifferenceResults.SuspendLayout();
			this.grbDifferenceSubjects.SuspendLayout();
			this.grbMergeOptions.SuspendLayout();
			this.pnlLtfMergeTarget.SuspendLayout();
			this.tabControl1.SuspendLayout();
			this.tabPage3.SuspendLayout();
			this.gbChangeSets.SuspendLayout();
			this.pnlChangeSetFiles.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.pcbSlideRight)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.pcbSlideLeft)).BeginInit();
			this.tabPage1.SuspendLayout();
			this.tabPage2.SuspendLayout();
			this.pnlMergeResults.SuspendLayout();
			this.statusStrip1.SuspendLayout();
			this.SuspendLayout();
			// 
			// txtPath1
			// 
			this.txtPath1.AllowDrop = true;
			this.txtPath1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.txtPath1.Location = new System.Drawing.Point(229, 13);
			this.txtPath1.Name = "txtPath1";
			this.txtPath1.Size = new System.Drawing.Size(477, 20);
			this.txtPath1.TabIndex = 0;
			this.txtPath1.TextChanged += new System.EventHandler(this.txtPath1_TextChanged);
			this.txtPath1.Click += new System.EventHandler(this.txtPath1_Click);
			// 
			// label2
			// 
			this.label2.Location = new System.Drawing.Point(10, 16);
			this.label2.Name = "label2";
			this.label2.Size = new System.Drawing.Size(58, 18);
			this.label2.TabIndex = 2;
			this.label2.Text = "To Path : ";
			this.label2.Click += new System.EventHandler(this.label2_Click);
			// 
			// label3
			// 
			this.label3.Location = new System.Drawing.Point(10, 59);
			this.label3.Name = "label3";
			this.label3.Size = new System.Drawing.Size(70, 20);
			this.label3.TabIndex = 4;
			this.label3.Text = "From Path :";
			// 
			// txtPath2
			// 
			this.txtPath2.AllowDrop = true;
			this.txtPath2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.txtPath2.Location = new System.Drawing.Point(229, 56);
			this.txtPath2.Name = "txtPath2";
			this.txtPath2.Size = new System.Drawing.Size(477, 20);
			this.txtPath2.TabIndex = 3;
			this.txtPath2.TextChanged += new System.EventHandler(this.txtPath2_TextChanged);
			this.txtPath2.Click += new System.EventHandler(this.txtPath2_Click);
			// 
			// cbtPath1
			// 
			this.cbtPath1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
			this.cbtPath1.Location = new System.Drawing.Point(708, 13);
			this.cbtPath1.Name = "cbtPath1";
			this.cbtPath1.Size = new System.Drawing.Size(24, 20);
			this.cbtPath1.TabIndex = 5;
			this.cbtPath1.Text = "...";
			this.cbtPath1.Click += new System.EventHandler(this.cbtPath1_Click);
			// 
			// cbtPath2
			// 
			this.cbtPath2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
			this.cbtPath2.Location = new System.Drawing.Point(708, 56);
			this.cbtPath2.Name = "cbtPath2";
			this.cbtPath2.Size = new System.Drawing.Size(24, 20);
			this.cbtPath2.TabIndex = 6;
			this.cbtPath2.Text = "...";
			this.cbtPath2.Click += new System.EventHandler(this.cbtPath2_Click);
			// 
			// trvDifResults
			// 
			this.trvDifResults.AllowDrop = true;
			this.trvDifResults.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
									| System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.trvDifResults.HideSelection = false;
			this.trvDifResults.ImageIndex = 0;
			this.trvDifResults.ImageList = this.imageList1;
			this.trvDifResults.Location = new System.Drawing.Point(10, 19);
			this.trvDifResults.Name = "trvDifResults";
			this.trvDifResults.PathSeparator = "";
			this.trvDifResults.SelectedImageIndex = 0;
			this.trvDifResults.Size = new System.Drawing.Size(832, 419);
			this.trvDifResults.TabIndex = 7;
			// 
			// imageList1
			// 
			this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
			this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
			this.imageList1.Images.SetKeyName(0, "");
			this.imageList1.Images.SetKeyName(1, "");
			this.imageList1.Images.SetKeyName(2, "");
			this.imageList1.Images.SetKeyName(3, "");
			this.imageList1.Images.SetKeyName(4, "");
			this.imageList1.Images.SetKeyName(5, "");
			this.imageList1.Images.SetKeyName(6, "");
			this.imageList1.Images.SetKeyName(7, "");
			this.imageList1.Images.SetKeyName(8, "");
			this.imageList1.Images.SetKeyName(9, "samefolder.bmp");
			this.imageList1.Images.SetKeyName(10, "addedfolder.bmp");
			this.imageList1.Images.SetKeyName(11, "difffolder.bmp");
			this.imageList1.Images.SetKeyName(12, "missingfolder.bmp");
			this.imageList1.Images.SetKeyName(13, "conflictfolder.bmp");
			this.imageList1.Images.SetKeyName(14, "delete.bmp");
			this.imageList1.Images.SetKeyName(15, "conflict.bmp");
			// 
			// cbtCompare
			// 
			this.cbtCompare.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
			this.cbtCompare.Location = new System.Drawing.Point(762, 496);
			this.cbtCompare.Name = "cbtCompare";
			this.cbtCompare.Size = new System.Drawing.Size(88, 24);
			this.cbtCompare.TabIndex = 8;
			this.cbtCompare.Text = "&Compare";
			this.cbtCompare.Click += new System.EventHandler(this.cbtCompare_Click);
			// 
			// cbtExit
			// 
			this.cbtExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
			this.cbtExit.DialogResult = System.Windows.Forms.DialogResult.Cancel;
			this.cbtExit.Location = new System.Drawing.Point(792, 557);
			this.cbtExit.Name = "cbtExit";
			this.cbtExit.Size = new System.Drawing.Size(64, 24);
			this.cbtExit.TabIndex = 9;
			this.cbtExit.Text = "E&xit";
			this.cbtExit.Click += new System.EventHandler(this.cbtExit_Click);
			// 
			// ckbIgnoreTabExpansions
			// 
			this.ckbIgnoreTabExpansions.Location = new System.Drawing.Point(10, 19);
			this.ckbIgnoreTabExpansions.Name = "ckbIgnoreTabExpansions";
			this.ckbIgnoreTabExpansions.Size = new System.Drawing.Size(144, 24);
			this.ckbIgnoreTabExpansions.TabIndex = 10;
			this.ckbIgnoreTabExpansions.Text = "Ignore Tab Expansions";
			// 
			// ckbIgnoreSpaceChanges
			// 
			this.ckbIgnoreSpaceChanges.Location = new System.Drawing.Point(170, 19);
			this.ckbIgnoreSpaceChanges.Name = "ckbIgnoreSpaceChanges";
			this.ckbIgnoreSpaceChanges.Size = new System.Drawing.Size(144, 24);
			this.ckbIgnoreSpaceChanges.TabIndex = 11;
			this.ckbIgnoreSpaceChanges.Text = "Ignore Space Changes";
			// 
			// ckbIgnoreWhiteSpace
			// 
			this.ckbIgnoreWhiteSpace.Location = new System.Drawing.Point(322, 19);
			this.ckbIgnoreWhiteSpace.Name = "ckbIgnoreWhiteSpace";
			this.ckbIgnoreWhiteSpace.Size = new System.Drawing.Size(160, 24);
			this.ckbIgnoreWhiteSpace.TabIndex = 12;
			this.ckbIgnoreWhiteSpace.Text = "Ignore WhiteSpace";
			// 
			// ckbIgnoreBlankLines
			// 
			this.ckbIgnoreBlankLines.Location = new System.Drawing.Point(10, 43);
			this.ckbIgnoreBlankLines.Name = "ckbIgnoreBlankLines";
			this.ckbIgnoreBlankLines.Size = new System.Drawing.Size(152, 24);
			this.ckbIgnoreBlankLines.TabIndex = 13;
			this.ckbIgnoreBlankLines.Text = "Ignore Blank Lines";
			// 
			// ckbIgnoreCase
			// 
			this.ckbIgnoreCase.Location = new System.Drawing.Point(170, 43);
			this.ckbIgnoreCase.Name = "ckbIgnoreCase";
			this.ckbIgnoreCase.Size = new System.Drawing.Size(176, 24);
			this.ckbIgnoreCase.TabIndex = 14;
			this.ckbIgnoreCase.Text = "Ignore Case";
			// 
			// ckbShowDiffs
			// 
			this.ckbShowDiffs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.ckbShowDiffs.Location = new System.Drawing.Point(10, 465);
			this.ckbShowDiffs.Name = "ckbShowDiffs";
			this.ckbShowDiffs.Size = new System.Drawing.Size(80, 16);
			this.ckbShowDiffs.TabIndex = 15;
			this.ckbShowDiffs.Text = "Show Diffs";
			this.ckbShowDiffs.CheckedChanged += new System.EventHandler(this.ckbAny_CheckedChanged);
			// 
			// ckbShowSames
			// 
			this.ckbShowSames.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.ckbShowSames.Location = new System.Drawing.Point(130, 465);
			this.ckbShowSames.Name = "ckbShowSames";
			this.ckbShowSames.Size = new System.Drawing.Size(96, 16);
			this.ckbShowSames.TabIndex = 16;
			this.ckbShowSames.Text = "Show Sames";
			this.ckbShowSames.CheckedChanged += new System.EventHandler(this.ckbAny_CheckedChanged);
			// 
			// ckbShowMissing
			// 
			this.ckbShowMissing.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.ckbShowMissing.Location = new System.Drawing.Point(242, 465);
			this.ckbShowMissing.Name = "ckbShowMissing";
			this.ckbShowMissing.Size = new System.Drawing.Size(112, 16);
			this.ckbShowMissing.TabIndex = 17;
			this.ckbShowMissing.Text = "Show Missing";
			this.ckbShowMissing.CheckedChanged += new System.EventHandler(this.ckbAny_CheckedChanged);
			// 
			// ckbShowAllPaths
			// 
			this.ckbShowAllPaths.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.ckbShowAllPaths.Location = new System.Drawing.Point(474, 487);
			this.ckbShowAllPaths.Name = "ckbShowAllPaths";
			this.ckbShowAllPaths.Size = new System.Drawing.Size(128, 16);
			this.ckbShowAllPaths.TabIndex = 18;
			this.ckbShowAllPaths.Text = "Show All Paths";
			this.ckbShowAllPaths.CheckedChanged += new System.EventHandler(this.ckbAny_CheckedChanged);
			// 
			// ckbShowTotals
			// 
			this.ckbShowTotals.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.ckbShowTotals.Location = new System.Drawing.Point(10, 487);
			this.ckbShowTotals.Name = "ckbShowTotals";
			this.ckbShowTotals.Size = new System.Drawing.Size(112, 16);
			this.ckbShowTotals.TabIndex = 19;
			this.ckbShowTotals.Text = "Show Dir. Totals";
			this.ckbShowTotals.CheckedChanged += new System.EventHandler(this.ckbAny_CheckedChanged);
			// 
			// ckbShowDiffMetrics
			// 
			this.ckbShowDiffMetrics.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.ckbShowDiffMetrics.Location = new System.Drawing.Point(130, 487);
			this.ckbShowDiffMetrics.Name = "ckbShowDiffMetrics";
			this.ckbShowDiffMetrics.Size = new System.Drawing.Size(112, 16);
			this.ckbShowDiffMetrics.TabIndex = 20;
			this.ckbShowDiffMetrics.Text = "Show Diff Metrics";
			this.ckbShowDiffMetrics.CheckedChanged += new System.EventHandler(this.ckbAny_CheckedChanged);
			// 
			// sbProgress
			// 
			this.sbProgress.Location = new System.Drawing.Point(0, 582);
			this.sbProgress.Name = "sbProgress";
			this.sbProgress.Size = new System.Drawing.Size(864, 24);
			this.sbProgress.TabIndex = 21;
			// 
			// ckbUserChecks
			// 
			this.ckbUserChecks.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.ckbUserChecks.Location = new System.Drawing.Point(242, 487);
			this.ckbUserChecks.Name = "ckbUserChecks";
			this.ckbUserChecks.Size = new System.Drawing.Size(92, 16);
			this.ckbUserChecks.TabIndex = 22;
			this.ckbUserChecks.Text = "User Checks";
			this.ckbUserChecks.CheckedChanged += new System.EventHandler(this.ckbAny_CheckedChanged);
			// 
			// ckbShowFullPaths
			// 
			this.ckbShowFullPaths.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.ckbShowFullPaths.Location = new System.Drawing.Point(361, 487);
			this.ckbShowFullPaths.Name = "ckbShowFullPaths";
			this.ckbShowFullPaths.Size = new System.Drawing.Size(106, 16);
			this.ckbShowFullPaths.TabIndex = 23;
			this.ckbShowFullPaths.Text = "Show Full Paths";
			this.ckbShowFullPaths.CheckedChanged += new System.EventHandler(this.ckbAny_CheckedChanged);
			// 
			// cmDiffFileNode
			// 
			this.cmDiffFileNode.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
            this.cmiShowWindiff,
            this.cmiShowGnu,
            this.cmiEditFrom,
            this.cmiEditTo,
            this.menuItem1});
			// 
			// cmiShowWindiff
			// 
			this.cmiShowWindiff.Index = 0;
			this.cmiShowWindiff.Text = "Show Differences";
			this.cmiShowWindiff.Click += new System.EventHandler(this.cmiShowWindiff_Click);
			// 
			// cmiShowGnu
			// 
			this.cmiShowGnu.Index = 1;
			this.cmiShowGnu.Text = "Show GnuDiff Results";
			this.cmiShowGnu.Click += new System.EventHandler(this.cmiShowGnu_Click);
			// 
			// cmiEditFrom
			// 
			this.cmiEditFrom.Index = 2;
			this.cmiEditFrom.Text = "Edit From File";
			this.cmiEditFrom.Click += new System.EventHandler(this.cmiEditFrom_Click);
			// 
			// cmiEditTo
			// 
			this.cmiEditTo.Index = 3;
			this.cmiEditTo.Text = "Edit To File";
			this.cmiEditTo.Click += new System.EventHandler(this.cmiEditTo_Click);
			// 
			// menuItem1
			// 
			this.menuItem1.Index = 4;
			this.menuItem1.Text = "Merge into...";
			this.menuItem1.Click += new System.EventHandler(this.menuItem1_Click);
			// 
			// ckbShowAdded
			// 
			this.ckbShowAdded.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.ckbShowAdded.Location = new System.Drawing.Point(361, 465);
			this.ckbShowAdded.Name = "ckbShowAdded";
			this.ckbShowAdded.Size = new System.Drawing.Size(112, 16);
			this.ckbShowAdded.TabIndex = 30;
			this.ckbShowAdded.Text = "Show Added";
			this.ckbShowAdded.CheckedChanged += new System.EventHandler(this.ckbAny_CheckedChanged);
			// 
			// cbtTFPath2
			// 
			this.cbtTFPath2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
			this.cbtTFPath2.Location = new System.Drawing.Point(735, 56);
			this.cbtTFPath2.Name = "cbtTFPath2";
			this.cbtTFPath2.Size = new System.Drawing.Size(28, 20);
			this.cbtTFPath2.TabIndex = 34;
			this.cbtTFPath2.Text = "$/";
			this.cbtTFPath2.Click += new System.EventHandler(this.cbtTFPath2_Click);
			// 
			// cbtTFPath1
			// 
			this.cbtTFPath1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
			this.cbtTFPath1.Location = new System.Drawing.Point(735, 13);
			this.cbtTFPath1.Name = "cbtTFPath1";
			this.cbtTFPath1.Size = new System.Drawing.Size(28, 20);
			this.cbtTFPath1.TabIndex = 33;
			this.cbtTFPath1.Text = "$/";
			this.cbtTFPath1.Click += new System.EventHandler(this.cbtTFPath1_Click);
			// 
			// cmbVersion1
			// 
			this.cmbVersion1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
			this.cmbVersion1.FormattingEnabled = true;
			this.cmbVersion1.Location = new System.Drawing.Point(769, 13);
			this.cmbVersion1.Name = "cmbVersion1";
			this.cmbVersion1.Size = new System.Drawing.Size(75, 21);
			this.cmbVersion1.TabIndex = 35;
			this.cmbVersion1.SelectedIndexChanged += new System.EventHandler(this.cmbVersion1_SelectedIndexChanged);
			this.cmbVersion1.DropDown += new System.EventHandler(this.cmbVersion1_DropDown);
			// 
			// cmbVersion2
			// 
			this.cmbVersion2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
			this.cmbVersion2.FormattingEnabled = true;
			this.cmbVersion2.Location = new System.Drawing.Point(769, 56);
			this.cmbVersion2.Name = "cmbVersion2";
			this.cmbVersion2.Size = new System.Drawing.Size(75, 21);
			this.cmbVersion2.TabIndex = 36;
			this.cmbVersion2.SelectedIndexChanged += new System.EventHandler(this.cmbVersion2_SelectedIndexChanged);
			this.cmbVersion2.DropDown += new System.EventHandler(this.cmbVersion2_DropDown);
			// 
			// label4
			// 
			this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.label4.AutoSize = true;
			this.label4.Location = new System.Drawing.Point(153, 446);
			this.label4.Name = "label4";
			this.label4.Size = new System.Drawing.Size(34, 13);
			this.label4.TabIndex = 38;
			this.label4.Text = "Same";
			// 
			// label5
			// 
			this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.label5.AutoSize = true;
			this.label5.Location = new System.Drawing.Point(33, 446);
			this.label5.Name = "label5";
			this.label5.Size = new System.Drawing.Size(47, 13);
			this.label5.TabIndex = 40;
			this.label5.Text = "Different";
			// 
			// label6
			// 
			this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.label6.AutoSize = true;
			this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
			this.label6.Location = new System.Drawing.Point(261, 446);
			this.label6.Name = "label6";
			this.label6.Size = new System.Drawing.Size(42, 13);
			this.label6.TabIndex = 42;
			this.label6.Text = "Missing";
			// 
			// label7
			// 
			this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.label7.AutoSize = true;
			this.label7.Location = new System.Drawing.Point(384, 446);
			this.label7.Name = "label7";
			this.label7.Size = new System.Drawing.Size(38, 13);
			this.label7.TabIndex = 44;
			this.label7.Text = "Added";
			// 
			// chkCompareToLocal
			// 
			this.chkCompareToLocal.Location = new System.Drawing.Point(193, 33);
			this.chkCompareToLocal.Name = "chkCompareToLocal";
			this.chkCompareToLocal.Size = new System.Drawing.Size(228, 24);
			this.chkCompareToLocal.TabIndex = 45;
			this.chkCompareToLocal.Text = "Compare from local TF versions";
			this.chkCompareToLocal.CheckedChanged += new System.EventHandler(this.chkCompareToLocal_CheckedChanged);
			// 
			// lblConflict
			// 
			this.lblConflict.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.lblConflict.AutoSize = true;
			this.lblConflict.Location = new System.Drawing.Point(495, 446);
			this.lblConflict.Name = "lblConflict";
			this.lblConflict.Size = new System.Drawing.Size(42, 13);
			this.lblConflict.TabIndex = 47;
			this.lblConflict.Text = "Conflict";
			// 
			// pbConflict
			// 
			this.pbConflict.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.pbConflict.Image = ((System.Drawing.Image)(resources.GetObject("pbConflict.Image")));
			this.pbConflict.Location = new System.Drawing.Point(474, 443);
			this.pbConflict.Name = "pbConflict";
			this.pbConflict.Size = new System.Drawing.Size(14, 15);
			this.pbConflict.TabIndex = 46;
			this.pbConflict.TabStop = false;
			// 
			// pictureBox3
			// 
			this.pictureBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
			this.pictureBox3.Location = new System.Drawing.Point(361, 443);
			this.pictureBox3.Name = "pictureBox3";
			this.pictureBox3.Size = new System.Drawing.Size(14, 15);
			this.pictureBox3.TabIndex = 43;
			this.pictureBox3.TabStop = false;
			// 
			// pictureBox2
			// 
			this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
			this.pictureBox2.Location = new System.Drawing.Point(242, 443);
			this.pictureBox2.Name = "pictureBox2";
			this.pictureBox2.Size = new System.Drawing.Size(14, 15);
			this.pictureBox2.TabIndex = 41;
			this.pictureBox2.TabStop = false;
			// 
			// pictureBox1
			// 
			this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
			this.pictureBox1.Location = new System.Drawing.Point(10, 443);
			this.pictureBox1.Name = "pictureBox1";
			this.pictureBox1.Size = new System.Drawing.Size(14, 15);
			this.pictureBox1.TabIndex = 39;
			this.pictureBox1.TabStop = false;
			// 
			// pbSame
			// 
			this.pbSame.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.pbSame.Image = ((System.Drawing.Image)(resources.GetObject("pbSame.Image")));
			this.pbSame.Location = new System.Drawing.Point(130, 443);
			this.pbSame.Name = "pbSame";
			this.pbSame.Size = new System.Drawing.Size(14, 15);
			this.pbSame.TabIndex = 37;
			this.pbSame.TabStop = false;
			this.pbSame.Click += new System.EventHandler(this.pbSame_Click);
			// 
			// cbtPatch
			// 
			this.cbtPatch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
			this.cbtPatch.Enabled = false;
			this.cbtPatch.Location = new System.Drawing.Point(668, 496);
			this.cbtPatch.Name = "cbtPatch";
			this.cbtPatch.Size = new System.Drawing.Size(88, 24);
			this.cbtPatch.TabIndex = 48;
			this.cbtPatch.Text = "&Make Patch";
			this.cbtPatch.Click += new System.EventHandler(this.cbtPatch_Click);
			// 
			// chkFromAsTo
			// 
			this.chkFromAsTo.Location = new System.Drawing.Point(13, 33);
			this.chkFromAsTo.Name = "chkFromAsTo";
			this.chkFromAsTo.Size = new System.Drawing.Size(174, 23);
			this.chkFromAsTo.TabIndex = 49;
			this.chkFromAsTo.Text = "\'From\' Path same as \'To\' Path";
			this.chkFromAsTo.CheckedChanged += new System.EventHandler(this.chkToAsFrom_CheckedChanged);
			// 
			// ckbTrackRenames
			// 
			this.ckbTrackRenames.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
			this.ckbTrackRenames.Location = new System.Drawing.Point(738, 33);
			this.ckbTrackRenames.Name = "ckbTrackRenames";
			this.ckbTrackRenames.Size = new System.Drawing.Size(106, 24);
			this.ckbTrackRenames.TabIndex = 50;
			this.ckbTrackRenames.Text = "Track Renames";
			this.ckbTrackRenames.CheckedChanged += new System.EventHandler(this.ckbTrackRenames_CheckedChanged);
			// 
			// grbDifferenceOptions
			// 
			this.grbDifferenceOptions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.grbDifferenceOptions.Controls.Add(this.ckbIgnoreSpaceChanges);
			this.grbDifferenceOptions.Controls.Add(this.ckbIgnoreTabExpansions);
			this.grbDifferenceOptions.Controls.Add(this.ckbIgnoreWhiteSpace);
			this.grbDifferenceOptions.Controls.Add(this.ckbIgnoreBlankLines);
			this.grbDifferenceOptions.Controls.Add(this.ckbIgnoreCase);
			this.grbDifferenceOptions.Location = new System.Drawing.Point(3, 192);
			this.grbDifferenceOptions.Name = "grbDifferenceOptions";
			this.grbDifferenceOptions.Size = new System.Drawing.Size(848, 72);
			this.grbDifferenceOptions.TabIndex = 51;
			this.grbDifferenceOptions.TabStop = false;
			this.grbDifferenceOptions.Text = "Difference Engine Options";
			// 
			// grbDifferenceResults
			// 
			this.grbDifferenceResults.Controls.Add(this.trvDifResults);
			this.grbDifferenceResults.Controls.Add(this.ckbShowSames);
			this.grbDifferenceResults.Controls.Add(this.ckbShowDiffs);
			this.grbDifferenceResults.Controls.Add(this.ckbShowMissing);
			this.grbDifferenceResults.Controls.Add(this.ckbShowAllPaths);
			this.grbDifferenceResults.Controls.Add(this.pbConflict);
			this.grbDifferenceResults.Controls.Add(this.ckbShowTotals);
			this.grbDifferenceResults.Controls.Add(this.label7);
			this.grbDifferenceResults.Controls.Add(this.ckbShowDiffMetrics);
			this.grbDifferenceResults.Controls.Add(this.pictureBox3);
			this.grbDifferenceResults.Controls.Add(this.ckbUserChecks);
			this.grbDifferenceResults.Controls.Add(this.label6);
			this.grbDifferenceResults.Controls.Add(this.ckbShowFullPaths);
			this.grbDifferenceResults.Controls.Add(this.pictureBox2);
			this.grbDifferenceResults.Controls.Add(this.ckbShowAdded);
			this.grbDifferenceResults.Controls.Add(this.label5);
			this.grbDifferenceResults.Controls.Add(this.pbSame);
			this.grbDifferenceResults.Controls.Add(this.pictureBox1);
			this.grbDifferenceResults.Controls.Add(this.label4);
			this.grbDifferenceResults.Controls.Add(this.lblConflict);
			this.grbDifferenceResults.Dock = System.Windows.Forms.DockStyle.Fill;
			this.grbDifferenceResults.Location = new System.Drawing.Point(3, 3);
			this.grbDifferenceResults.Name = "grbDifferenceResults";
			this.grbDifferenceResults.Size = new System.Drawing.Size(848, 517);
			this.grbDifferenceResults.TabIndex = 52;
			this.grbDifferenceResults.TabStop = false;
			this.grbDifferenceResults.Text = "Difference Engine Results";
			// 
			// grbDifferenceSubjects
			// 
			this.grbDifferenceSubjects.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.grbDifferenceSubjects.Controls.Add(this.sselConnection2);
			this.grbDifferenceSubjects.Controls.Add(this.sselConnection1);
			this.grbDifferenceSubjects.Controls.Add(this.txtPath2);
			this.grbDifferenceSubjects.Controls.Add(this.chkCompareToLocal);
			this.grbDifferenceSubjects.Controls.Add(this.chkFromAsTo);
			this.grbDifferenceSubjects.Controls.Add(this.label2);
			this.grbDifferenceSubjects.Controls.Add(this.label3);
			this.grbDifferenceSubjects.Controls.Add(this.cmbVersion2);
			this.grbDifferenceSubjects.Controls.Add(this.cbtPath1);
			this.grbDifferenceSubjects.Controls.Add(this.cmbVersion1);
			this.grbDifferenceSubjects.Controls.Add(this.cbtPath2);
			this.grbDifferenceSubjects.Controls.Add(this.cbtTFPath2);
			this.grbDifferenceSubjects.Controls.Add(this.txtPath1);
			this.grbDifferenceSubjects.Controls.Add(this.cbtTFPath1);
			this.grbDifferenceSubjects.Controls.Add(this.ckbTrackRenames);
			this.grbDifferenceSubjects.Location = new System.Drawing.Point(3, 0);
			this.grbDifferenceSubjects.Name = "grbDifferenceSubjects";
			this.grbDifferenceSubjects.Size = new System.Drawing.Size(848, 92);
			this.grbDifferenceSubjects.TabIndex = 53;
			this.grbDifferenceSubjects.TabStop = false;
			this.grbDifferenceSubjects.Text = "To and From Paths";
			this.grbDifferenceSubjects.Enter += new System.EventHandler(this.groupBox1_Enter);
			// 
			// sselConnection2
			// 
			this.sselConnection2.Connection = null;
			this.sselConnection2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
			this.sselConnection2.FormattingEnabled = true;
			this.sselConnection2.Location = new System.Drawing.Point(74, 55);
			this.sselConnection2.Name = "sselConnection2";
			this.sselConnection2.Size = new System.Drawing.Size(149, 21);
			this.sselConnection2.TabIndex = 52;
			// 
			// sselConnection1
			// 
			this.sselConnection1.Connection = null;
			this.sselConnection1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
			this.sselConnection1.FormattingEnabled = true;
			this.sselConnection1.Location = new System.Drawing.Point(74, 12);
			this.sselConnection1.Name = "sselConnection1";
			this.sselConnection1.Size = new System.Drawing.Size(149, 21);
			this.sselConnection1.TabIndex = 51;
			// 
			// grbMergeOptions
			// 
			this.grbMergeOptions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.grbMergeOptions.Controls.Add(this.label1);
			this.grbMergeOptions.Controls.Add(this.rbtTFSMerge);
			this.grbMergeOptions.Controls.Add(this.rbtLizardMerge);
			this.grbMergeOptions.Controls.Add(this.pnlLtfMergeTarget);
			this.grbMergeOptions.Controls.Add(this.cmbTfsMergeTarget);
			this.grbMergeOptions.Location = new System.Drawing.Point(3, 98);
			this.grbMergeOptions.Name = "grbMergeOptions";
			this.grbMergeOptions.Size = new System.Drawing.Size(848, 88);
			this.grbMergeOptions.TabIndex = 54;
			this.grbMergeOptions.TabStop = false;
			this.grbMergeOptions.Text = "Merge Options";
			// 
			// label1
			// 
			this.label1.AutoSize = true;
			this.label1.Location = new System.Drawing.Point(3, 49);
			this.label1.Name = "label1";
			this.label1.Size = new System.Drawing.Size(77, 13);
			this.label1.TabIndex = 3;
			this.label1.Text = "Merge Target :";
			// 
			// rbtTFSMerge
			// 
			this.rbtTFSMerge.AutoSize = true;
			this.rbtTFSMerge.Enabled = false;
			this.rbtTFSMerge.Location = new System.Drawing.Point(238, 19);
			this.rbtTFSMerge.Name = "rbtTFSMerge";
			this.rbtTFSMerge.Size = new System.Drawing.Size(428, 17);
			this.rbtTFSMerge.TabIndex = 1;
			this.rbtTFSMerge.Text = "TFS Merge (to direct TFS branches only, requires same To and From repository path" +
					"s)";
			this.rbtTFSMerge.UseVisualStyleBackColor = true;
			this.rbtTFSMerge.CheckedChanged += new System.EventHandler(this.rbtTFSMerge_CheckedChanged);
			// 
			// rbtLizardMerge
			// 
			this.rbtLizardMerge.AutoSize = true;
			this.rbtLizardMerge.Checked = true;
			this.rbtLizardMerge.Location = new System.Drawing.Point(6, 19);
			this.rbtLizardMerge.Name = "rbtLizardMerge";
			this.rbtLizardMerge.Size = new System.Drawing.Size(204, 17);
			this.rbtLizardMerge.TabIndex = 0;
			this.rbtLizardMerge.TabStop = true;
			this.rbtLizardMerge.Text = "Lizard Merge (to any file system folder)";
			this.rbtLizardMerge.UseVisualStyleBackColor = true;
			this.rbtLizardMerge.CheckedChanged += new System.EventHandler(this.rbtLizardMerge_CheckedChanged);
			// 
			// pnlLtfMergeTarget
			// 
			this.pnlLtfMergeTarget.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.pnlLtfMergeTarget.Controls.Add(this.btnLtfMergeTarget);
			this.pnlLtfMergeTarget.Controls.Add(this.txtLtfMergeTarget);
			this.pnlLtfMergeTarget.Location = new System.Drawing.Point(86, 43);
			this.pnlLtfMergeTarget.Name = "pnlLtfMergeTarget";
			this.pnlLtfMergeTarget.Size = new System.Drawing.Size(758, 26);
			this.pnlLtfMergeTarget.TabIndex = 2;
			// 
			// btnLtfMergeTarget
			// 
			this.btnLtfMergeTarget.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
			this.btnLtfMergeTarget.Location = new System.Drawing.Point(730, 3);
			this.btnLtfMergeTarget.Name = "btnLtfMergeTarget";
			this.btnLtfMergeTarget.Size = new System.Drawing.Size(24, 20);
			this.btnLtfMergeTarget.TabIndex = 8;
			this.btnLtfMergeTarget.Text = "...";
			this.btnLtfMergeTarget.Click += new System.EventHandler(this.btnLtfMergeTarget_Click);
			// 
			// txtLtfMergeTarget
			// 
			this.txtLtfMergeTarget.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.txtLtfMergeTarget.Location = new System.Drawing.Point(3, 3);
			this.txtLtfMergeTarget.Name = "txtLtfMergeTarget";
			this.txtLtfMergeTarget.Size = new System.Drawing.Size(726, 20);
			this.txtLtfMergeTarget.TabIndex = 0;
			// 
			// cmbTfsMergeTarget
			// 
			this.cmbTfsMergeTarget.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.cmbTfsMergeTarget.FormattingEnabled = true;
			this.cmbTfsMergeTarget.Location = new System.Drawing.Point(88, 45);
			this.cmbTfsMergeTarget.Name = "cmbTfsMergeTarget";
			this.cmbTfsMergeTarget.Size = new System.Drawing.Size(752, 21);
			this.cmbTfsMergeTarget.TabIndex = 5;
			// 
			// tabControl1
			// 
			this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
									| System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.tabControl1.Controls.Add(this.tabPage3);
			this.tabControl1.Controls.Add(this.tabPage1);
			this.tabControl1.Controls.Add(this.tabPage2);
			this.tabControl1.Location = new System.Drawing.Point(2, 3);
			this.tabControl1.Name = "tabControl1";
			this.tabControl1.SelectedIndex = 0;
			this.tabControl1.Size = new System.Drawing.Size(862, 549);
			this.tabControl1.TabIndex = 55;
			// 
			// tabPage3
			// 
			this.tabPage3.BackColor = System.Drawing.Color.Transparent;
			this.tabPage3.Controls.Add(this.cbtRollbackChangesets);
			this.tabPage3.Controls.Add(this.cbtPrepareMerge);
			this.tabPage3.Controls.Add(this.cbtViewChangesets);
			this.tabPage3.Controls.Add(this.gbChangeSets);
			this.tabPage3.Controls.Add(this.cbtCompare);
			this.tabPage3.Controls.Add(this.cbtPatch);
			this.tabPage3.Controls.Add(this.grbDifferenceSubjects);
			this.tabPage3.Controls.Add(this.grbDifferenceOptions);
			this.tabPage3.Controls.Add(this.grbMergeOptions);
			this.tabPage3.Location = new System.Drawing.Point(4, 22);
			this.tabPage3.Name = "tabPage3";
			this.tabPage3.Size = new System.Drawing.Size(854, 523);
			this.tabPage3.TabIndex = 2;
			this.tabPage3.Text = "Selections";
			this.tabPage3.UseVisualStyleBackColor = true;
			// 
			// cbtRollbackChangesets
			// 
			this.cbtRollbackChangesets.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
			this.cbtRollbackChangesets.Location = new System.Drawing.Point(480, 496);
			this.cbtRollbackChangesets.Name = "cbtRollbackChangesets";
			this.cbtRollbackChangesets.Size = new System.Drawing.Size(88, 24);
			this.cbtRollbackChangesets.TabIndex = 58;
			this.cbtRollbackChangesets.Text = "&Rollback";
			this.cbtRollbackChangesets.Click += new System.EventHandler(this.cbtRollbackChangesets_Click);
			// 
			// cbtPrepareMerge
			// 
			this.cbtPrepareMerge.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
			this.cbtPrepareMerge.Location = new System.Drawing.Point(574, 496);
			this.cbtPrepareMerge.Name = "cbtPrepareMerge";
			this.cbtPrepareMerge.Size = new System.Drawing.Size(88, 24);
			this.cbtPrepareMerge.TabIndex = 57;
			this.cbtPrepareMerge.Text = "&Prepare Merge";
			this.cbtPrepareMerge.Click += new System.EventHandler(this.cbtPrepareMerge_Click);
			// 
			// cbtViewChangesets
			// 
			this.cbtViewChangesets.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.cbtViewChangesets.Location = new System.Drawing.Point(3, 496);
			this.cbtViewChangesets.Name = "cbtViewChangesets";
			this.cbtViewChangesets.Size = new System.Drawing.Size(104, 24);
			this.cbtViewChangesets.TabIndex = 57;
			this.cbtViewChangesets.Text = "&View Changesets";
			this.cbtViewChangesets.Click += new System.EventHandler(this.cbtViewChangesets_Click);
			// 
			// gbChangeSets
			// 
			this.gbChangeSets.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
									| System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.gbChangeSets.Controls.Add(this.pnlChangeSetFiles);
			this.gbChangeSets.Controls.Add(this.lvwHistory);
			this.gbChangeSets.Location = new System.Drawing.Point(3, 271);
			this.gbChangeSets.Name = "gbChangeSets";
			this.gbChangeSets.Size = new System.Drawing.Size(847, 219);
			this.gbChangeSets.TabIndex = 55;
			this.gbChangeSets.TabStop = false;
			this.gbChangeSets.Text = "Changesets";
			// 
			// pnlChangeSetFiles
			// 
			this.pnlChangeSetFiles.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
									| System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.pnlChangeSetFiles.Controls.Add(this.lvwDetails);
			this.pnlChangeSetFiles.Controls.Add(this.splitter1);
			this.pnlChangeSetFiles.Controls.Add(this.lblCSFilesOutsidePath);
			this.pnlChangeSetFiles.Controls.Add(this.pcbSlideRight);
			this.pnlChangeSetFiles.Controls.Add(this.pcbSlideLeft);
			this.pnlChangeSetFiles.Controls.Add(this.swcCaption);
			this.pnlChangeSetFiles.Location = new System.Drawing.Point(816, 8);
			this.pnlChangeSetFiles.Name = "pnlChangeSetFiles";
			this.pnlChangeSetFiles.Size = new System.Drawing.Size(24, 208);
			this.pnlChangeSetFiles.TabIndex = 5;
			// 
			// lvwDetails
			// 
			this.lvwDetails.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
									| System.Windows.Forms.AnchorStyles.Left)));
			this.lvwDetails.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
            this.lchFile,
            this.lchChangeType,
            this.lchFolder});
			this.lvwDetails.FullRowSelect = true;
			this.lvwDetails.HideSelection = false;
			this.lvwDetails.Location = new System.Drawing.Point(22, 0);
			this.lvwDetails.Name = "lvwDetails";
			this.lvwDetails.Size = new System.Drawing.Size(128, 184);
			this.lvwDetails.SmallImageList = this.fileImages;
			this.lvwDetails.StateImageList = this.fileImages;
			this.lvwDetails.TabIndex = 3;
			this.lvwDetails.UseCompatibleStateImageBehavior = false;
			this.lvwDetails.View = System.Windows.Forms.View.Details;
			// 
			// lchFile
			// 
			this.lchFile.Text = "File";
			this.lchFile.Width = 121;
			// 
			// lchChangeType
			// 
			this.lchChangeType.Text = "Change Type";
			this.lchChangeType.Width = 81;
			// 
			// lchFolder
			// 
			this.lchFolder.Text = "Folder";
			this.lchFolder.Width = 296;
			// 
			// fileImages
			// 
			this.fileImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("fileImages.ImageStream")));
			this.fileImages.TransparentColor = System.Drawing.Color.Magenta;
			this.fileImages.Images.SetKeyName(0, "$folder");
			this.fileImages.Images.SetKeyName(1, "$down");
			this.fileImages.Images.SetKeyName(2, "$up");
			// 
			// splitter1
			// 
			this.splitter1.Location = new System.Drawing.Point(0, 0);
			this.splitter1.Name = "splitter1";
			this.splitter1.Size = new System.Drawing.Size(3, 208);
			this.splitter1.TabIndex = 2;
			this.splitter1.TabStop = false;
			this.splitter1.SplitterMoving += new System.Windows.Forms.SplitterEventHandler(this.splitter1_SplitterMoving);
			this.splitter1.LocationChanged += new System.EventHandler(this.splitter1_LocationChanged);
			this.splitter1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.splitter1_MouseMove);
			this.splitter1.Move += new System.EventHandler(this.splitter1_Move);
			this.splitter1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitter1_SplitterMoved);
			this.splitter1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.splitter1_MouseDown);
			this.splitter1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.splitter1_MouseUp);
			// 
			// lblCSFilesOutsidePath
			// 
			this.lblCSFilesOutsidePath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.lblCSFilesOutsidePath.AutoSize = true;
			this.lblCSFilesOutsidePath.ForeColor = System.Drawing.Color.Red;
			this.lblCSFilesOutsidePath.Location = new System.Drawing.Point(16, 190);
			this.lblCSFilesOutsidePath.Name = "lblCSFilesOutsidePath";
			this.lblCSFilesOutsidePath.Size = new System.Drawing.Size(16, 13);
			this.lblCSFilesOutsidePath.TabIndex = 6;
			this.lblCSFilesOutsidePath.Text = "   ";
			// 
			// pcbSlideRight
			// 
			this.pcbSlideRight.Image = ((System.Drawing.Image)(resources.GetObject("pcbSlideRight.Image")));
			this.pcbSlideRight.Location = new System.Drawing.Point(3, 4);
			this.pcbSlideRight.Name = "pcbSlideRight";
			this.pcbSlideRight.Size = new System.Drawing.Size(18, 19);
			this.pcbSlideRight.TabIndex = 1;
			this.pcbSlideRight.TabStop = false;
			this.pcbSlideRight.Visible = false;
			this.pcbSlideRight.Click += new System.EventHandler(this.pcbSlideRight_Click);
			// 
			// pcbSlideLeft
			// 
			this.pcbSlideLeft.Image = ((System.Drawing.Image)(resources.GetObject("pcbSlideLeft.Image")));
			this.pcbSlideLeft.Location = new System.Drawing.Point(3, 4);
			this.pcbSlideLeft.Name = "pcbSlideLeft";
			this.pcbSlideLeft.Size = new System.Drawing.Size(18, 19);
			this.pcbSlideLeft.TabIndex = 0;
			this.pcbSlideLeft.TabStop = false;
			this.pcbSlideLeft.Click += new System.EventHandler(this.pcbSlideLeft_Click);
			// 
			// swcCaption
			// 
			this.swcCaption.ForeColor = System.Drawing.Color.RoyalBlue;
			this.swcCaption.Location = new System.Drawing.Point(7, 28);
			this.swcCaption.Name = "swcCaption";
			this.swcCaption.Size = new System.Drawing.Size(19, 90);
			this.swcCaption.TabIndex = 4;
			// 
			// lvwHistory
			// 
			this.lvwHistory.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
									| System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.lvwHistory.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
            this.lchChangeset,
            this.lchAuthor,
            this.lchDate,
            this.lchComment,
            this.lchWorkItems});
			this.lvwHistory.FullRowSelect = true;
			this.lvwHistory.HideSelection = false;
			this.lvwHistory.Location = new System.Drawing.Point(3, 16);
			this.lvwHistory.Name = "lvwHistory";
			this.lvwHistory.Size = new System.Drawing.Size(807, 197);
			this.lvwHistory.TabIndex = 4;
			this.lvwHistory.UseCompatibleStateImageBehavior = false;
			this.lvwHistory.View = System.Windows.Forms.View.Details;
			// 
			// lchChangeset
			// 
			this.lchChangeset.Text = "Changeset";
			this.lchChangeset.Width = 69;
			// 
			// lchAuthor
			// 
			this.lchAuthor.Text = "Author";
			this.lchAuthor.Width = 79;
			// 
			// lchDate
			// 
			this.lchDate.Text = "Date";
			this.lchDate.Width = 103;
			// 
			// lchComment
			// 
			this.lchComment.Text = "Comment";
			this.lchComment.Width = 416;
			// 
			// lchWorkItems
			// 
			this.lchWorkItems.Text = "Work Items";
			this.lchWorkItems.Width = 166;
			// 
			// tabPage1
			// 
			this.tabPage1.BackColor = System.Drawing.Color.Transparent;
			this.tabPage1.Controls.Add(this.grbDifferenceResults);
			this.tabPage1.Location = new System.Drawing.Point(4, 22);
			this.tabPage1.Name = "tabPage1";
			this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
			this.tabPage1.Size = new System.Drawing.Size(854, 523);
			this.tabPage1.TabIndex = 0;
			this.tabPage1.Text = "Diff Results";
			this.tabPage1.UseVisualStyleBackColor = true;
			// 
			// tabPage2
			// 
			this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
			this.tabPage2.Controls.Add(this.chkAllChangedFiles);
			this.tabPage2.Controls.Add(this.btnAutoMerge);
			this.tabPage2.Controls.Add(this.btnManualMerge);
			this.tabPage2.Controls.Add(this.pnlMergeResults);
			this.tabPage2.Location = new System.Drawing.Point(4, 22);
			this.tabPage2.Name = "tabPage2";
			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
			this.tabPage2.Size = new System.Drawing.Size(854, 523);
			this.tabPage2.TabIndex = 1;
			this.tabPage2.Text = "Merge Results";
			// 
			// chkAllChangedFiles
			// 
			this.chkAllChangedFiles.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
			this.chkAllChangedFiles.AutoSize = true;
			this.chkAllChangedFiles.Location = new System.Drawing.Point(6, 498);
			this.chkAllChangedFiles.Name = "chkAllChangedFiles";
			this.chkAllChangedFiles.Size = new System.Drawing.Size(280, 17);
			this.chkAllChangedFiles.TabIndex = 60;
			this.chkAllChangedFiles.Text = "Show files where all changes are already in the target.";
			this.chkAllChangedFiles.UseVisualStyleBackColor = true;
			this.chkAllChangedFiles.CheckedChanged += new System.EventHandler(this.chkAllChangedFiles_CheckedChanged);
			// 
			// btnAutoMerge
			// 
			this.btnAutoMerge.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
			this.btnAutoMerge.Location = new System.Drawing.Point(668, 493);
			this.btnAutoMerge.Name = "btnAutoMerge";
			this.btnAutoMerge.Size = new System.Drawing.Size(88, 24);
			this.btnAutoMerge.TabIndex = 59;
			this.btnAutoMerge.Text = "&Auto Resolve";
			this.btnAutoMerge.Click += new System.EventHandler(this.btnAutoMerge_Click);
			// 
			// btnManualMerge
			// 
			this.btnManualMerge.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
			this.btnManualMerge.Location = new System.Drawing.Point(762, 493);
			this.btnManualMerge.Name = "btnManualMerge";
			this.btnManualMerge.Size = new System.Drawing.Size(88, 24);
			this.btnManualMerge.TabIndex = 58;
			this.btnManualMerge.Text = "&Resolve";
			this.btnManualMerge.Click += new System.EventHandler(this.btnManualMerge_Click);
			// 
			// pnlMergeResults
			// 
			this.pnlMergeResults.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
									| System.Windows.Forms.AnchorStyles.Left)
									| System.Windows.Forms.AnchorStyles.Right)));
			this.pnlMergeResults.Controls.Add(this.lsvMergeResults);
			this.pnlMergeResults.Controls.Add(this.statusStrip1);
			this.pnlMergeResults.Location = new System.Drawing.Point(0, 0);
			this.pnlMergeResults.Name = "pnlMergeResults";
			this.pnlMergeResults.Size = new System.Drawing.Size(854, 487);
			this.pnlMergeResults.TabIndex = 3;
			// 
			// lsvMergeResults
			// 
			this.lsvMergeResults.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
            this.chmrFileName,
            this.chmrPath,
            this.chmrInserts,
            this.chmrChanges,
            this.chmrDeletes,
            this.chmrConflicts,
            this.chmrExisting,
            this.chmrNewName,
            this.chmrResolutions});
			this.lsvMergeResults.Dock = System.Windows.Forms.DockStyle.Fill;
			this.lsvMergeResults.FullRowSelect = true;
			this.lsvMergeResults.GridLines = true;
			this.lsvMergeResults.HideSelection = false;
			this.lsvMergeResults.Location = new System.Drawing.Point(0, 0);
			this.lsvMergeResults.Name = "lsvMergeResults";
			this.lsvMergeResults.Size = new System.Drawing.Size(854, 465);
			this.lsvMergeResults.SmallImageList = this.imlMergeList;
			this.lsvMergeResults.TabIndex = 3;
			this.lsvMergeResults.UseCompatibleStateImageBehavior = false;
			this.lsvMergeResults.View = System.Windows.Forms.View.Details;
			this.lsvMergeResults.DoubleClick += new System.EventHandler(this.lsvMergeResults_DoubleClick);
			// 
			// chmrFileName
			// 
			this.chmrFileName.Text = "Name";
			this.chmrFileName.Width = 180;
			// 
			// chmrPath
			// 
			this.chmrPath.Text = "Path";
			this.chmrPath.Width = 180;
			// 
			// chmrInserts
			// 
			this.chmrInserts.Text = "Inserts";
			this.chmrInserts.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
			this.chmrInserts.Width = 50;
			// 
			// chmrChanges
			// 
			this.chmrChanges.Text = "Changes";
			this.chmrChanges.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
			this.chmrChanges.Width = 50;
			// 
			// chmrDeletes
			// 
			this.chmrDeletes.Text = "Deletes";
			this.chmrDeletes.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
			this.chmrDeletes.Width = 50;
			// 
			// chmrConflicts
			// 
			this.chmrConflicts.Text = "Conflicts";
			this.chmrConflicts.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
			this.chmrConflicts.Width = 50;
			// 
			// chmrExisting
			// 
			this.chmrExisting.Text = "Existing Changes";
			this.chmrExisting.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
			this.chmrExisting.Width = 50;
			// 
			// chmrNewName
			// 
			this.chmrNewName.Text = "NewName";
			this.chmrNewName.Width = 120;
			// 
			// imlMergeList
			// 
			this.imlMergeList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imlMergeList.ImageStream")));
			this.imlMergeList.TransparentColor = System.Drawing.Color.Black;
			this.imlMergeList.Images.SetKeyName(0, "changed.bmp");
			this.imlMergeList.Images.SetKeyName(1, "conflict.bmp");
			this.imlMergeList.Images.SetKeyName(2, "changeandnameconflictt.bmp");
			this.imlMergeList.Images.SetKeyName(3, "doubleConflict.bmp");
			this.imlMergeList.Images.SetKeyName(4, "add.bmp");
			this.imlMergeList.Images.SetKeyName(5, "delete.bmp");
			this.imlMergeList.Images.SetKeyName(6, "AddConflict.bmp");
			this.imlMergeList.Images.SetKeyName(7, "DeleteConflict.bmp");
			this.imlMergeList.Images.SetKeyName(8, "ChangeConflict.bmp");
			this.imlMergeList.Images.SetKeyName(9, "DoubleConflict2.bmp");
			this.imlMergeList.Images.SetKeyName(10, "allexisting.bmp");
			// 
			// statusStrip1
			// 
			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.tsslMergeable,
            this.tsslConflictingChanges,
            this.tsslExisting});
			this.statusStrip1.Location = new System.Drawing.Point(0, 465);
			this.statusStrip1.Name = "statusStrip1";
			this.statusStrip1.Size = new System.Drawing.Size(854, 22);
			this.statusStrip1.TabIndex = 2;
			this.statusStrip1.Text = "statusStrip1";
			// 
			// tsslMergeable
			// 
			this.tsslMergeable.Name = "tsslMergeable";
			this.tsslMergeable.Size = new System.Drawing.Size(143, 17);
			this.tsslMergeable.Text = "Mergeable Changed Files : 0";
			// 
			// tsslConflictingChanges
			// 
			this.tsslConflictingChanges.Name = "tsslConflictingChanges";
			this.tsslConflictingChanges.Size = new System.Drawing.Size(143, 17);
			this.tsslConflictingChanges.Text = "Conflicting Changed Files : 0";
			// 
			// tsslExisting
			// 
			this.tsslExisting.Name = "tsslExisting";
			this.tsslExisting.Size = new System.Drawing.Size(130, 17);
			this.tsslExisting.Text = "Existing Changed Files : 0";
			// 
			// chmrResolutions
			// 
			this.chmrResolutions.Text = "Resolutions";
			this.chmrResolutions.Width = 150;
			// 
			// DirDiff
			// 
			this.AllowDrop = true;
			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
			this.ClientSize = new System.Drawing.Size(864, 606);
			this.Controls.Add(this.tabControl1);
			this.Controls.Add(this.sbProgress);
			this.Controls.Add(this.cbtExit);
			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
			this.MinimumSize = new System.Drawing.Size(678, 536);
			this.Name = "DirDiff";
			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
			this.Text = "LizardTF Difference Engine And Merge Tool";
			this.Resize += new System.EventHandler(this.DirDiff_Resize);
			((System.ComponentModel.ISupportInitialize)(this.pbConflict)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.pbSame)).EndInit();
			this.grbDifferenceOptions.ResumeLayout(false);
			this.grbDifferenceResults.ResumeLayout(false);
			this.grbDifferenceResults.PerformLayout();
			this.grbDifferenceSubjects.ResumeLayout(false);
			this.grbDifferenceSubjects.PerformLayout();
			this.grbMergeOptions.ResumeLayout(false);
			this.grbMergeOptions.PerformLayout();
			this.pnlLtfMergeTarget.ResumeLayout(false);
			this.pnlLtfMergeTarget.PerformLayout();
			this.tabControl1.ResumeLayout(false);
			this.tabPage3.ResumeLayout(false);
			this.gbChangeSets.ResumeLayout(false);
			this.pnlChangeSetFiles.ResumeLayout(false);
			this.pnlChangeSetFiles.PerformLayout();
			((System.ComponentModel.ISupportInitialize)(this.pcbSlideRight)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.pcbSlideLeft)).EndInit();
			this.tabPage1.ResumeLayout(false);
			this.tabPage2.ResumeLayout(false);
			this.tabPage2.PerformLayout();
			this.pnlMergeResults.ResumeLayout(false);
			this.pnlMergeResults.PerformLayout();
			this.statusStrip1.ResumeLayout(false);
			this.statusStrip1.PerformLayout();
			this.ResumeLayout(false);

		}

		#endregion

		private Button cbtRollbackChangesets;
		private Label lblCSFilesOutsidePath;
		private ColumnHeader chmrResolutions;

	}
}
